Merge "rdbms: Fix grammar in DBTransactionSizeError log message"

diff --combined includes/libs/rdbms/loadbalancer/LoadBalancer.php
index 1df2409,f8f7708..56a7fbb
--- 1/includes/libs/rdbms/loadbalancer/LoadBalancer.php
--- 2/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@@ -62,6 -62,8 +62,6 @@@ class LoadBalancer implements ILoadBala
        private $chronProt;
        /** @var BagOStuff */
        private $srvCache;
 -      /** @var BagOStuff */
 -      private $memCache;
        /** @var WANObjectCache */
        private $wanCache;
        /** @var object|string Class name or object With profileIn/profileOut methods */
@@@ -185,6 -187,11 +185,6 @@@
                } else {
                        $this->srvCache = new EmptyBagOStuff();
                }
 -              if ( isset( $params['memCache'] ) ) {
 -                      $this->memCache = $params['memCache'];
 -              } else {
 -                      $this->memCache = new EmptyBagOStuff();
 -              }
                if ( isset( $params['wanCache'] ) ) {
                        $this->wanCache = $params['wanCache'];
                } else {
@@@ -237,7 -244,7 +237,7 @@@
                        }
  
                        $this->loadMonitor = new $class(
 -                              $this, $this->srvCache, $this->memCache, $this->loadMonitorConfig );
 +                              $this, $this->srvCache, $this->wanCache, $this->loadMonitorConfig );
                        $this->loadMonitor->setLogger( $this->replLogger );
                }
  
@@@ -1165,7 -1172,7 +1165,7 @@@
                        if ( $limit > 0 && $time > $limit ) {
                                throw new DBTransactionSizeError(
                                        $conn,
-                                       "Transaction spent $time second(s) in writes, exceeding the $limit limit.",
+                                       "Transaction spent $time second(s) in writes, exceeding the limit of $limit.",
                                        [ $time, $limit ]
                                );
                        }